Merge from mainline.
authorXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 10:46:33 +0000 (18:46 +0800)
committerXue Fuqiao <xfq@gnu.org>
Fri, 28 Feb 2014 10:46:33 +0000 (18:46 +0800)
commite488e776983b4805f1d75c152f8d04adb590c83b
tree95b6430b5cde194d441cbd8130aff7e881342f9b
parent4283a5f1409f8705055b4358fd17a84bbea0cf43
parentedd2301478da76f4f13ee222b1c209041eced485
Merge from mainline.